From 5aa4a5153ec7db844639a56094f5ca465810f169 Mon Sep 17 00:00:00 2001 From: =?utf8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 15 Dec 2017 10:54:49 +0100 Subject: [PATCH] Simpler library handling. PKGBUILD+release, lto. --- build/archlinux/PKGBUILD | 8 +++++++- meson.build | 19 ++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/build/archlinux/PKGBUILD b/build/archlinux/PKGBUILD index 6e87dc6..48e6eae 100644 --- a/build/archlinux/PKGBUILD +++ b/build/archlinux/PKGBUILD @@ -5,7 +5,7 @@ pkgname=babl-meson-git _pkgname=babl -pkgver=0.1.38.14.g9677c79 +pkgver=0.1.38.17.gf50bef7 pkgrel=1 pkgdesc="babl is a dynamic, any to any, pixel format translation library." arch=('i686' 'x86_64') @@ -27,6 +27,8 @@ build() { meson "${srcdir}/${_gitname}"\ "${srcdir}/build" \ --prefix=/usr \ + -Dbuildtype=release \ + -Db_lto=true \ -Dwith-docs=false ninja -C "${srcdir}/build" @@ -40,3 +42,7 @@ pkgver() { cd "${_gitname}" git describe --always | sed -e 's/BABL_//g' -e 's/[_-]/./g' } + +check() { + meson test -C "${srcdir}/build" +} diff --git a/meson.build b/meson.build index 9d330ed..ffd6b53 100644 --- a/meson.build +++ b/meson.build @@ -197,21 +197,10 @@ w3m = find_program('w3m', required: false) ################################################################################ # Dependencies -if os_win32 - math = [] - thread = [] -else - math = cc.find_library('m') - thread = cc.find_library('pthread') -endif - -if platform_android - log = cc.find_library('log') -else - log = [] -endif - -dl = cc.find_library('dl') +math = cc.find_library('m', required: false) +thread= cc.find_library('pthread', required: false) +log = cc.find_library('log', required: false) +dl = cc.find_library('dl', required: false) pkgconfig.generate(filebase: 'babl', -- 2.30.2